UAR-784 - Adding changes from KCI-531.