=rem #3621 updates according to review