Merge commit '70783b9c9be31e98421f17327a1127021abae672' into upstream-merge