EDREI-11753: Adaptation according to review of Johan.