Reduce stack load times due to image loading
Merge branch 'bugfix-10827' into release-6.0.1