Merge "Don't read or persist historical registry on the critical path" into sc-dev