Upstream version 20180605.gitc905079