Added 1.16-1 changes