temporary commit to merge
Merge remote-tracking branch 'origin/feature/sstring' into feature/sstring
fix compilation error