refs #1518
Merge branch 'ui'