Preparing v1.2 changes