* Co-authored-by offl <offl@users.noreply.github.com> * cherry-pick commit (e63c6c594e)
e63c6c594e
Please read this before adding new SQL-update files.