final changes for 6.10.14