Upstream version 160919