Merge branch 'new-swagger-endpoints' into 'main'