Re-applied commits of last 2 days.