Merge commit '96d00473b8f48045630714aeffb9ac2e47051292' into upstream