Add hss/ralf/cdf changes