Merge commit 'ee3d5d64b8f5f091433b62383f349ac95647dd3a' into upstream