Fix for U4-4913
Merge pull request #412 from BatJan/7.1.5-ux-4913

Fix for U4-4913