Dont rely on modules, use them if theyre there
Support TII2
Update string identifiers
Add missing DB var
Merge branch 'master' into STABLE