Merge "500 Error Reponse on NCMP inventory cmhandle search"