Merge branch 'ltv_enc_crash_fix' into 'main'

LTV crash fix - 1 [allow regression]

See merge request !623