Upstream version 9.40.20180718+ds