Upstream version 20181016