Small settings correction
Merge remote-tracking branch 'origin/0.0' into 0.0