Issue: spotlight display suite fields rearranged
Issue: spotlight feature override
Merge remote-tracking branch 'origin/display'