Merge "Add additional CB atoms" into rvc-dev