The scope of this PR is already quite large, and we must merge it in this week.