Reconcile build

Merge 2.14's QA and UAT changes back into master.