Consistency rules: C1, C2, C3.1, C3.2
Merge branch 'develop' into local
Merge branch 'reuben-develop' into local