Initial import from CCI-Shared-Code