Feature/ciinrd 15