Feature/cdap 1047 fix ds spec