Upstream version 1.78+ds