Code review: 191800043:  Changes for issue 61.