Merge pull request #1 from cala/master

3 backports from Classic DB