Updated for 1.6.2-R.01