Merge commit 'b00226fdf5d68c5ccd29cf48034f35bb1025f6d2' into rebase-r293584