Upstream version 21.1.9+ds