Reconcile build

Merge 2.14 QA and UAT changes into master.