all tests passing now
Merge branch 'debug-build-issues'