Master bug 10607 - SQL Box can change the database

Zoran, could it be that there is something missing here? The PR for 3.3 has a few more lines. Did you test this?