(cherry picked from commit 6dc57047) (cherry picked from commit e6407ca2)
mentioned in commit cba87064
mentioned in commit 4ac578db