Restore previously wrongly updated content from branch 3.6