Merge commit 'f37acf6b6adf1cc6c103981332f6db7f2002dcdc' into next-merge-partial