Merge commit 'upstream/1.3.0'