Aleksandrs patch to possible solution of (Fixes BUGZ-4021)
Begin arcbot message
This merge request is automatically copied from !1231 (merged) orginally made by @maikenp
End arcbot message
Edited by Maiken
Begin arcbot message
This merge request is automatically copied from !1231 (merged) orginally made by @maikenp
End arcbot message