Updated for 1.7.2-R0.1