fs: Merge s3ve3g changes

Signed-off-by: Zhao Wei Liew <zhaoweiliew@gmail.com>