Updates for NCC
Resolving merge conflicts