Moved s3 code into fifo_util.
Merge branch 'test' into dev
Bump.