GUI-468
updates based on code review