Merge "Avoid duplicate classes in boot path." into main