Preparing first 1.8 update