(Griffin) Add Griffin option, enable by default