Merge "Merge 2 'query' end points in NCMP"