Catch-up merge from master, mainly to pick up chain-zones merge.