Merge "Move GenericAtom from pulled atom group to pushed atom group"