Tweaking contentManager health check
Merge branch 'develop'