Squashed 'Common/' changes from 6d3b330..a1aa14a

a1aa14a New Feature

git-subtree-dir: Common
git-subtree-split: a1aa14a9a283797bae19ea5074f7f7efedfa430d
Merge commit '09f1df91113747428d0369e565b89dc1c2b7ed39'