Merge remote-tracking branch 'origin/develop' into 71-create-metrics-endpoints-for-tmf-resource-related-information
