Chore/cci

@tejohnso please review. thanks!

@alexey-rise FYI.