Implemented GRAILS-10760