v2.9.8 changes