v2.8.8 changes applied