Merge "Fix FCAPS health check issue"