Merge branch...

Merge branch '33-enhance-the-user-experience-at-landing-metrics-page-when-apis-are-not-responding' into 'develop'

Resolve "Enhance the user experience at landing/metrics page, when APIs are not responding"

See merge request !31