Merge "Only run search edu when enabled, also make code more generic." into 24D1-dev