SI-7029 - changes after code review