Co-authored-by: p (cherry picked from commit 37419cdc26c2b5c4f8583fc2ba439b08fab42856)
:core
:core:common