Task/619 merge develop

std::string should not be necessary.
Why do we have a change like this?
One more a few lines below ...