Yesterday
merge from ui_mipmap_fixes