temporary changes to fix the code bug which blocks the shutdown hook#14

krishnaprasadas wants to merge 1 commit intomaingoto/firehose:mainfrom

archival-temp-fixgoto/firehose:archival-temp-fixCopy head branch name to clipboard