Merge branch 'hotfix/1.0.11' into develop
propagate frame change to custom image view
Merge branch 'develop'