JUDDI-894 added