Revert "Revert "11.7""

This reverts commit cd4900c3694a75ec9429dd5cdcf3bcf6d5e89710.