Follow up ticket

Follow up ticket

Follow ticket #203234