Updated for 1.5.2-R0.1