With hat: apache Security: 49adfbe5-e7d1-11ec-8fbd-d4c9ef517024 MFH: 2022Q2 (cherry picked from commit 096bce03)