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