Merge "Fail early if supplementary info isn't populated" into main