The merge request fixed problems for VTM-3.2.
Cannot test it for the current VTM because it fails with other problems before the behavior described in #180 can occur - for this reason submitting it as WIP.