Merge pull request from AdollaApp/dev-image-scaling More dev image scaling fixes