first set of patches for activity restructuring