Switch s3 branch to master