Yesterday
merge from clone_icons_fix