Fix/dnd visibility and associations
#2599

Paul-Bob wants to merge fix/dnd_visibility_and_associations into main

We do not currently have an analysis of these two commits