Merge branch 'staging' into OCF77-discover-api-with-comm_type-protocol-and-data_format-as-query-parameters-is-failing