-- UCCPAR-431, fixed #a from https://jmaconsulting.jira.com/browse/UCCPA...

...R-431