Move v1.5 changes