Base settings works.
Merge remote-tracking branch 'origin/Semi-final' into Semi-final