Updated for 1.4.7-R1.0