Merge "store preferential configs if no error from CS" into udc-qpr-dev