Fix for LTV crash issue See merge request !1234
mentioned in issue #1407 (closed)
mentioned in issue #1410