Added 1.2.5 changes