Apply code review
Merge branch 'localization' into vmlist