Merge "Set initial KSV state after inflation" into pi-dev