Merge branch 'raman/master_config'