prep for 2.9.6