Merge pull request #16 from dintel/master

Please merge my changes upstream
Merge pull request #17 from dintel/master

Resurrect ZSRV-11165 workaround
Add some debugging info