Follow up ticket

Follow up ticket

Follow up ticket #213051