[JBIDE-15597] finishing implementation