Merge branch '397_i18n_sort_indicator'