Code

Merge commit 'upstream/1.4.7'