bluesky404's updates for both files
Merge branch 'sharlikran-localization-bluesky404' into sharlikran-dev