Merge commit 'fe1f3f3774d0bd44e8bb981e8e20d02777d5c784' into rebase-r293584