Resolve #3596790 "2"

Boris Doesborgrequested to merge
issue/country-3596790:3596790-2 into 2.2.x

Closes #3596790

Merge request reports