Last steps before tagging to 2.4