Follow up ticket

Follow up ticket

FOLLOW UP TICKET #216641