merge with minor S3