Merge "Prevent waiting synchronous case if transaction applied first" into sc-dev