U4 1521

Hopefully this fulfills the requirements of ticket U4-1521 although having no experience of the client dependency groups I'm not sure if what I've done actually provides the expected benefits?