Committing configuration changes
Merged changes update to PM-1