Merge pull request #247 from fmkassem/master-next

Enable OCC for Garrison