Merge branch 'lyt-2.1.x'
Merge branch 'master' into remove-unused-images