Initial CTR commit
fixed merge conflicts