Added CompatUtils. Will be adding more.
Suppress warning in compat utils
Merge branch 'master' into develop