Add compiler option
Merge branch 'feature/utgb-web' into feature/utgb-2.0