Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream