Preparing 1.8 update