Code contributions

Branch from master, run make ci-local, fill the PR template. Do not weaken tests to get a green build.