Merge "Adding shell-internal version of StubTransaction" into udc-dev