Closes #151
Closes #152
Merge branch 'master' into contentmetadata
closes #117