JBIDE-14985 PR 7 from @mistria