Merge "Fix crash when loading string cache" into tm-dev