Merge branch 'remitamine-ndr'