Merge commit 'upstream/master' into prv/po