Merge branch 'master' into STORM-405-transactional-support
Merge branch 'master' into STORM-405-transactional-support