Merge branch 'master' into storage-module