1. Fix build failure.
2. Couple of issues with tx management were fixed.
Merge branch 'rid-set-sbtree' into develop