COMMIT 221014

Modification ISSU   #817350