Updated for 1.4.7-R0.2