Merge "Store process of window in Session" into main