OS-2371 push for OS-2271 omitted two files