FEND-1143 most simple solution to the problem
Merge branch 'dev/FEND-1143' into release/2.7.1rc