Merge branch 'master' into 19-feature-link-to-the-applications-included-in-oas

2 jobs for 19-feature-link-to-the-applications-included-in-oas in 2 minutes and 41 seconds (queued for 5 seconds)