#JC-1268 Changes after code review.