Merge s3ve3g

Signed-off-by: Robert Rozic <r.rozic97@gmail.com>