Follow up tickets

Follow up tickets

Follow up tickets 

#197026 and #196483 

Thank you