Merge branch 'ltv_crash_fixes_2' into 'main'

LTV crash fixes, crashes encountered with newly introduced changes

See merge request !500