Merge remote branch 'origin/master' into type-nats