Solution for  U4-4548
Merge pull request #338 from vnbaaij/7.1.0

Solution for  U4-4548