Initial commit of 4.2