Feature/nocdr updates #82

Closed strilov closed 1 year ago