Catch-up merge from master.