2.4-develop
Merge remote-tracking branch 'origin/AC-17283' into Platform_Health_Track_02July
migrated pull request #11459 to 2.3 develop