Commented out unnecessary CPP language extension
Merge branch 'maint-2.4.0'