Merge commit '4dad7f1ec51e13b40d2554d666cc122ed898d8e6' into upstream-merge