Merge commit '370593c3bd81b3bb9e8c29ae7f6e351b7a7e0263' into upstream