CONN-443: Updates for DR unsupported guidance error.
CONN-443: use latest Common Types.