I thought that it was already in place for the first round last time, but maybe I'm misremembering things.
The exact way the contest will be organised will depend a lot on the number of entries, and also on how many of them are double-entries, so I'm not going to say anything concrete on this for a while, but to the extent possible, avoiding self-competition is something I will strive for.