should not complete when running transactionless
Merge branch 'hotfix-6.0.2'