Co-authored-by: p (cherry picked from commit 9b8ab6acc25a5f99c9c5eebf9cc250975931c57c)
:core
:core:common