add workaround for MRELEASE-812