Merge changes Iebbd7b72,I91f85463 into main

* changes:
  Transactions refactor.
  Transactions refactor.