Updated CMake options.
Touched common sources.
Merge branch 'master' into develop

* master:
  Touched common sources.
  Updated CMake options.