Resolved automerger from branch-23.04
to branch-23.06
#13080
Merged
branch-23.04
to branch-23.06
#13080