Fixes T134
Works for me, functional tests will follow in another review request
Looks good to me. Glad to hear that the simple fix was enough in this case
Closed by commit rRSDBba16b5c0e56c (authored by @mkrizek).