Merge "Fix string compression, add tests."