Merge with master except smb.