Merge branch 'master', remote-tracking branch 'origin'
MODE-1959 Updated "no-client-transactions" so that they are able to work nested one within the other.