BG localization - SVN r357