Review comments. #1183