Support for HDP 2.1.1.0