added UAA to component list
Merge remote-tracking branch 'origin/pr/492' into develop