Ivory 14 10 acu167641 cherry pick fixes from master