Merge commit 'c39d81a33a94238d026d672f5d96ee9651192bf4' into upstream