some updates for the feature 5678
fixed strings
Merge branch 'wsp-5678-fix-333' into wsp-1234-fix-999
merging in the "wrong" direction to mess a bit more