Merge branch 'master' into developer
catchup
Installation process fixes
More Installation fixes
Merge branch 'developer'