Last update before porting to 1.7