CoC snapshot updates

This commit is made to prepare for upgrade to CoC 0.9.2.