HG-42 adjust for CR comments