Merge "Changes default timeout for rotation memorization." into sc-dev