Co-authored-by: sfarouq-ext <116093375+sfarouq-ext@users.noreply.github.com> Refs: MON-20991 Refs: CTOR-427