Machine level configuration
Merge branch 'develop_tarun' of https://github.com/prabhsimransingh/Moviq_Master_Repo.git