Merge "Run transaction handling whenever you flush" into rvc-dev