NCD/NCR Command patches

NCD/NCR Command patches