Merge "Add SO update config file -application.yaml file" into dublin