Fix/ji 6152 review adjustments #235

Closed wwalmnes closed 6 months ago