CRM-14811 - Full Text - Move settings. Merge NYSS changes.