toggle forum Features
Merge remote-tracking branch 'origin/feature/options' into feature/options