#JC-1268 Changes afer code review.