Started porting to 1.8-dev