task 13845 after first code review