(Manual updated for RC2)