Synchronize master branch with OpenAPI baseline approved at the June 2020 SA plenary See merge request sa5/data-models!45