Merge "Merge "Do not fail session.commit on current thread" into oc-mr1-dev am: 304d267066 am: b1e0282aa3  -s ours"