EUCA-7063, syncing up behavior of walrus with s3