Merge branch 'master' into STORM-1040