Merge "CORD-3.0 is deprecated, remove from test targets"