Seems like your changes needs to be rerolled to the latest 8.2.x-dev branch. ...