Adds block comments per #3134 review