Merge "Zen priority settings update" into oc-dr1-dev