(cherry picked from commit 0c651d32) (cherry picked from commit b6811758)
mentioned in commit 25f6fbdc