Updated for 1.4.7-R.0.1