Merge "Only apply early offsets when transaction has been applied" into rvc-dev