Merge branch 'master' into MODULES-1014/add-noop-mode