Merge Rel 17 143e later merge request to Rel18
This is to merge the later merge request content (143e) from Rel-17 to Rel-18. So as to align the contents in Rel-17 and Rel-18 for OpenApi.
This is to merge the later merge request content (143e) from Rel-17 to Rel-18. So as to align the contents in Rel-17 and Rel-18 for OpenApi.