Mate: merge with upstream