Changes for RC2 1.8.3