CF-174 The view has been split into two views, one for each association.