Merge PR #2615: CCConfiguration extension (rewritten)