Merge "Handle cfg-gated dependencies." into main