Merge commit 'afb63ebd0a9599312c27ecceb839a399740e00ef' into upstream-merge