final changes before 5.2.2 release