ref #4028 - minor change in common-ui