Merged 3.11.7 changes, bumped to 3.11.7.1