Merge commit '4c91cd28105485ae04b5cc9e5150e346fddf0874' into upstream-merge