Merge of feature/CSR-6-registration