MDL-22015 fixed more string_manager encapsulation issues