#660: More review comments