(cherry picked from commit 1e472a6c) (cherry picked from commit 82fcf663)
mentioned in commit 1162a21a