Merge branch 'update_open_api_spex' into 'develop'