Follow up ticket

Follow up ticket

Follow up ticket #234081