#JC-1282 Changes after code review.