Yesterday
merge from wirecolor_nre_fix