(cherry picked from commit a4fd6cd3) (cherry picked from commit 8b29c4a4)
mentioned in commit ba28e6fc