Merge branch 'develop' into feature-consts
Defined primitive constants.
Merge branch 'feature-consts' into develop