Merge "Merge from ecomp 3374149f - AngularJS UI"