Merge "Update stashing hotseat logic." into main