Merge "Ensure transaction is applied if added after SSG is complete" into udc-dev