draft shim for hive-0.13.1 and need test