Merge "Refactor ncmp request handlers (fix async issue)"