Adapting image scale to avoid image pixels
Merge branch 'feature/adapt_scale' into develop
Merge branch 'develop'