Cherry pick 5de2f 06451 0364b 07ff7 a374d and full pass on acatqa and ext-tests