Merge commit '5610c3aaf4196cf714fb9cb57118187963550d1c' into upstream-merge