Merge branch 'refactor/no_strings' into develop

1 job for develop in 1 minute and 44 seconds (queued for 3 seconds)