Merge commit 'upstream/master' into pub/po