Merge remote-tracking branch 'lucas/strings-fix'