Merge "Support generating secondary OTAs from directories" into main