[Finished #48466613] Add ability to resolve a grouping of wats