Another localization refinement
Merge branch 'develop'