First iteration of HDP 1.2 support