JBIDE-13371 intermitent failure, but only fixed for master