Merge pull request 244 into uat