CDB 3474

Public header reviewed