Upstream version 20180309