Merge branch 'basop-2469-object-editing-artifacts-in-basop' into 'main'

Minor cleanup/harmonization under FIX_BASOP_2469_OBJ_EDIT_TD_REND_GAIN

See merge request !2564