backport from master branch to 41x branch for JBIDE-13942