PIM-3057 : prepare the RC2