Fixes: #1754 tools for upgrading schema