Merge branch 'hotfix/1.5.1'
Merge branch 'release/1.6.0'
Add support for automatically saving/deleting associated image models to the image behavior
Merge branch 'release/1.7.0'
Merge branch 'release/1.7.0' into develop
Fix a few bugs in the image controller
Merge branch 'hotfix/1.7.1' into develop