Fix issue VUFIND-1039
Merge branch 'release-2.3'