Pulled in changes from 1.6.27-5