Feature/csr 6 registration