Merge pull request #2158 from ControlSystemStudio/CSSTUDIO-1600

Bug fix for commit #2155
1 job for ESS-4.6.523 in 11 minutes and 40 seconds
latest