Added common files
Merge commit '0b2eddcfd89e607ba841d8b663b77e9f3e6a7d91' into testing