Merge "Move the system readiness verification up" into main