Manually merge commit 'ee5593c286'

* commit 'ee5593c286':

BUG:35326265