Follow-up ticket #230102

Follow-up ticket #230102

Follow-up ticket #230102