upstream 2.1.2