Merge "Apply transaction before calling onFinish" into udc-dev