settings adjustment.
THBRAID: settings
THBRAID: settings adjustment
THBRAID: settings adjustment
Merge branch 'staging' into testing