Merge "Increase retention period of staged sessions"