- refactor localization
- snapshot movement
Merge remote-tracking branch 'origin/master'