(cherry picked from commit f5966324) CCMAIL: niccolo.venerandi@gmail.com BUG: 438349 FIXED-IN: 5.22.1