Merge pull request #241 from purplecabbage/patch-1

CB-13237 Default to UAP