Fix #635 Dependency parity check
12 files changed