VE-983 DEBUG: changes base on code review