Fix grid builder unit rule-consolidation
Moving the variable initialization out of the loop broke the
rule-consolidation mechanism.
Merge branch 'hotfix/griddle' into develop
Merge branch 'hotfix/griddle'
Merge branch 'release/griddlefix'