Sync Master with Grizzly

Needed to support coi installer project.