Merge "Add changes lost in I467a8b4fa5cc610c3e1627f30631a55ecd6c91c1"