Merge "changed revision of flow-capable transaction"