follow up case for 9_3
 Please enter the commit message for your changes. Lines starting