Merge branch 'bug/JUDDI-937'