JUDDI-883 fixed
JUDDI-886 fixed
JUDDI-884 fixed