Merge "Fix acquire and framenumber mismatch in transaction complete callback" into sc-dev