Merge "Do not fail session.commit on current thread" into oc-mr1-dev