pr #3356

Changes from code review.