Merge "Change default for NR advanced ratcheting config" into udc-qpr-dev