Updated to 4.11.7 (not completed)