Minor sync with v1.4.8.0 and removed some commented code.