Merge commit 'holger/strings'