Fixed a bug in StateBlocks causing them to not be created properly.
Merge branch 'mac-develop' into develop