Resolve #3620142 "2.x"

Hervé Donnerrequested to merge
issue/cas-3620142:3620142-2.x into 2.x

Closes #3620142

Merge request reports