Merge branch 'dgolovin-JBIDE-17254-MASTER'