first set of patches for activity restructuring
first set of patches for activity restructuring