(cherry picked from commit 912f33e0712034648d393874f14a27cf168bf68b) (cherry picked from commit e242121880ffa1535ad5ed89036a09cc3a6806af) (cherry picked from commit d1a5ab463e3645ddf49818e23ccdea961721c187) (cherry picked from commit e23e14b3607101ade5dec81216d032579c5282ca)
For https://review.opendev.org/897549
(cherry picked from commit 912f33e0712034648d393874f14a27cf168bf68b) (cherry picked from commit e242121880ffa1535ad5ed89036a09cc3a6806af) (cherry picked from commit d1a5ab463e3645ddf49818e23ccdea961721c187) (cherry picked from commit e23e14b3607101ade5dec81216d032579c5282ca)