Merge branch 'release/1.6.0' into develop
Change the file behavior to not save the file before the owner is validated
Merge branch 'release/1.7.0'