Upstream version 1.18.6