Merge "[BUG] CPS NCMP Change extension in health check URL"