Re: [PATCH 1/2] Refactor internal mncc code