Import Upstream version 5.16.12

4 jobs for upstream/5.16.12
latest