[packages_10.03.2] aprx: merge r29048, r29199