BUG:433640 (cherry picked from commit df8c2d56999d8da420ca25a5a2638c4b19ba8278)
mentioned in commit fa24f90a