Fixes T130
None
Looks good to me. Please merge into develop
Closed by commit rTRGR33bb18a9d512 (authored by @mkrizek).