Update for 2.1.4-RC2