applied JBIDE-14913 with * to avoid version fluxes