OS-2357 comments