Merge "Reduces the timeout of rotation memeorization." into sc-dev