EDREI-11753 - Changes during code-review.