#JC-1185 Changes after code review.