FIX (CodeAnalyzer): @W-15295547@: Merging release-3 into dev-3 to resolve merge conflicts. #1423

Closed jfeingold35 closed 6 months ago