merge from hair_fixes