TMDM-6923 Commit between Colors and Sizes load
Merge branch 'maintenance/5.6'