Initial commit of 3.0.20 changes