[packages_10.03.2] natpmp: merge r29199