refs #1579
Merge branch 'ui'