Added a merge function for StateBlocks
Merge branch 'feature-renderlib-stateblock' into develop