Upstream version 3.1-20191025-1