Merge branch 'hotfix/remove_aperture' into develop
Merge branch 'release/1.2'