Integrated rerating feature into latest master build