Merge commit '0b45c3af0d7947a3b38aeffea3e0eeac4f59d46a' into upstream