Merge branch 'issue_669_ltv_crash_fix' into 'main'

Fix for ltv crash issue reported in issue 669

See merge request !51