Catch-up merge from master for files outside "code".