Updated for HDP 2.1
merged