Workaround for CONPRO-1516