Enabled ostr (out_string) variant in NullServer
Merge branch '2_10'