merge master  mostly nul byte SAN fix/tests (just want the tests here)