cb-165

merge after cb-154, as this feature branch is based on cb-154