Fix for localizer typo
Merge branch 'master' into test
Trying to finish tuning