Code review (Merge only after CR: are addressed)

Comments - pay attention to -
//CR: