Changes to enable reproducing ENTMQ466