Merge "Fix NPE when combining pop with add transaction." into nyc-support-25.2-dev