Co-authored-by: p (cherry picked from commit 6f422745ba6db135514ac4959216923932565760)
:core
:core:common