Merge "Fix wrap() propogating state the wrong direction" into nyc-support-24.1-dev