10 Commits (fixes/grcontext-options)