Dev commit from 10.4.14 - FIXpart1