Squashed 'Common/' changes from e93975f..9e22066

9e22066 Cleanup
779b21f Added a test file

git-subtree-dir: Common
git-subtree-split: 9e2206612d9e718c10f1c018feb6878961ec520e
Merge commit '7129216d23946c55209bbdb8937ef0ef29d9adfc' into review