Merge branch 'basop-2235-local-mods' into basop-2235-td-renderer-mismatch-between-model-data-word16-and-calculations-word32