Merge branch 'mr_541_updates' into 'main'

Fix for LTV crashes observed with changes made for issue 824 (MR 541)

See merge request !543