Follow up ticket

Follow up ticket

Follow up ticket #203752