Follo-up ticket

Follo-up ticket

Follow-up ticket #241060