Merge branch 'mlxse-resource-query'