Merge branch 'staging' into OCF92-review-all-location-resource-header-created-according-to-events-service