Merge pull request #785 from bvssvni/master

Made Gfx opt-in