Merge "SF: Also edit currentState in doTransaction" into nyc-dev