HIVE-8972: stash work
HIVE-8972: initial work