LUN-819 -- change after code review