Merge branch 'main' into develop

0 jobs for 15-there-is-a-wrong-greek-character-in-catalog_get_resourcespec_by_name_category-message-name
in 0 seconds, using 0 compute credits, and was queued for 0 seconds
yaml invalid error