Modifications required by jenkins job
Merge branch 'feature/51236357/installer' into develop