Merge branch 'feature/const-propagate2' into develop #74