Follow up ticket

Follow up ticket

Follow up ticket #284613