init: Merge s3ve3g changes