UAR-781 - Committing modified code, pulled in changes from KC 3.1.1