code review - DO NOT MERGE

Your code review DO NOT MERGE - see # CR comments inline