Merge branch 'release/v1.9' into develop
Fix indentation
Merge branch 'develop'