(cherry picked from commit b419e877) (cherry picked from commit bf3d671b)
mentioned in commit 8849b5f6