(cherry picked from commit 66bff73b) (cherry picked from commit f7ce2e98)
mentioned in commit 7b6e0f74