Initial commit of G1.9 changes