Squashed 'Common/' changes from a1aa14a..1d61702

1d61702 Added extra

git-subtree-dir: Common
git-subtree-split: 1d617020530e55c8015d840d4ce06b5ed05c80f8
Merge commit 'e0c944a2968018dd0b63e9f7558f9be6fca74dca' into review