Merge branch '292-hasstateblocks-addstateblock-needs-to-register-sb-s' into adapting-to-multiple-processor-motion-285