Merge changes If53d3ee3,I7cc0eea1

* changes:
  Implemented Nested Transaction
  Add strict flag in transaction