TBD-61 : add CDH5.1 support