branch for 2.4.0 RC2 changes