Pick a better name for the facet sort name field
Merge branch 'master' into merge_guides2 with additional tweaks.