Merge branch 'Integration-rel16-SA5-136-for-merge' into 'Rel-16'

Merge OpenAPI code agreed in SA#91 to Rel16 branch

See merge request !94