Sourcery port of build for the S3 (d2)