diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24b9857529..754ddd0af9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ variables:
   CI_REGISTRY_IMAGE: oerdnj/bind9
 
 stages:
+  - precheck
   - build
   - test
 
@@ -102,6 +103,20 @@ stages:
     expire_in: '1 week'
     when: on_failure
 
+precheck:debian:sid:amd64:
+  <<: *debian_sid_amd64_image
+  stage: precheck
+  script:
+    - perl util/check-changes CHANGES
+    - perl -w util/merge_copyrights
+    - diff -urNap util/copyrights util/newcopyrights
+    - rm util/newcopyrights
+  artifacts:
+    paths:
+    - util/newcopyrights
+    expire_in: '1 week'
+    when: on_failure
+
 #build:debian:jessie:amd64:
 #  <<: *debian_jessie_amd64_image
 #  <<: *build_job
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index afc42f3708..c00f4fcfc2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,12 @@
 <!--
- - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  -
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this
  - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -
+ - See the COPYRIGHT file distributed with this work for additional
+ - information regarding copyright ownership.
 -->
 ## BIND Source Access and Contributor Guidelines
 *Feb 22, 2018*
diff --git a/util/copyrights b/util/copyrights
index b252056166..a43fa006ba 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -3,8 +3,8 @@
 ./.gitlab-ci.yml				X	2018
 ./Atffile					X	2011,2018
 ./CHANGES					X	2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./CONTRIBUTING                                  X       2017,2018
-./CONTRIBUTING.md                               MKD     2017,2018
+./CONTRIBUTING					X	2017,2018
+./CONTRIBUTING.md				MKD	2017,2018
 ./COPYRIGHT					X	1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./HISTORY					X	2010,2013,2016,2017,2018
 ./HISTORY.md					MKD	2017,2018
@@ -675,55 +675,43 @@
 ./bin/tests/system/addzone/ns3/redirect.db.2	ZONE	2017,2018
 ./bin/tests/system/addzone/setup.sh		SH	2010,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/addzone/tests.sh		SH	2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/allow_query/.gitignore	X	2018
-./bin/tests/system/allow_query/clean.sh		SH	2010,2012,2014,2015,2016,2018
-./bin/tests/system/allow_query/ns2/aclallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/acldisallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/aclnotallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/added.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/addrallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/addrdisallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/addrnotallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/any.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/keyallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/keydisallow.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named01.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named02.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named03.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named04.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named05.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named06.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named07.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named08.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named09.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named10.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named11.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named12.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named21.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named22.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named23.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named24.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named25.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named26.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named27.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named28.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named29.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named30.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named31.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named32.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named33.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named34.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named40.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named53.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named54.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named55.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named56.conf.in	CONF-C	2010,2016,2018
-./bin/tests/system/allow_query/ns2/named57.conf.in	CONF-C	2013,2016,2018
-./bin/tests/system/allow_query/ns2/none.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/normal.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/ns2/previous.db	ZONE	2010,2016,2018
-./bin/tests/system/allow_query/setup.sh		SH	2010,2012,2016,2018
-./bin/tests/system/allow_query/tests.sh		SH	2010,2012,2013,2016,2018
+./bin/tests/system/allow-query/.gitignore	X	2018
+./bin/tests/system/allow-query/clean.sh		SH	2010,2012,2014,2015,2016,2018
+./bin/tests/system/allow-query/ns2/generic.db	ZONE	2018
+./bin/tests/system/allow-query/ns2/named01.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named02.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named03.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named04.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named05.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named06.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named07.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named08.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named09.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named10.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named11.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named12.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named21.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named22.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named23.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named24.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named25.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named26.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named27.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named28.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named29.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named30.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named31.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named32.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named33.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named34.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named40.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named53.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named54.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named55.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named56.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow-query/ns2/named57.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/allow-query/setup.sh		SH	2010,2012,2016,2018
+./bin/tests/system/allow-query/tests.sh		SH	2010,2012,2013,2016,2018
 ./bin/tests/system/ans.pl			PERL	2011,2012,2014,2016,2017,2018
 ./bin/tests/system/auth/clean.sh		SH	2018
 ./bin/tests/system/auth/ns1/example.com.db	ZONE	2018
@@ -860,6 +848,7 @@
 ./bin/tests/system/checkconf/bad-dnssec.conf	CONF-C	2012,2013,2016,2018
 ./bin/tests/system/checkconf/bad-glue-cache-bogus.conf	CONF-C	2017,2018
 ./bin/tests/system/checkconf/bad-hint.conf	CONF-C	2014,2016,2018
+./bin/tests/system/checkconf/bad-in-view-dup.conf	CONF-C	2018
 ./bin/tests/system/checkconf/bad-inline-slave.conf	CONF-C	2013,2016,2018
 ./bin/tests/system/checkconf/bad-keep-response-order.conf	CONF-C	2015,2016,2018
 ./bin/tests/system/checkconf/bad-lifetime.conf	CONF-C	2014,2016,2018
@@ -2303,6 +2292,7 @@
 ./bin/tests/system/statschannel/traffic.expect.6	X	2015,2016,2018
 ./bin/tests/system/stop.pl			SH	2001,2004,2005,2006,2007,2012,2016,2017,2018
 ./bin/tests/system/stop.sh			SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/stopall.sh			SH	2018
 ./bin/tests/system/stress/clean.sh		SH	2000,2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/stress/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/stress/ns2/named.conf	CONF-C	2018
@@ -3803,7 +3793,9 @@
 ./lib/irs/tests/testdata/domain.conf		CONF-SH	2016,2018
 ./lib/irs/tests/testdata/nameserver-v4.conf	CONF-SH	2016,2018
 ./lib/irs/tests/testdata/nameserver-v6.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/options-bad-ndots.conf	CONF-SH	2018
 ./lib/irs/tests/testdata/options-debug.conf	CONF-SH	2016,2018
+./lib/irs/tests/testdata/options-empty.conf	CONF-SH	2018
 ./lib/irs/tests/testdata/options-ndots.conf	CONF-SH	2016,2018
 ./lib/irs/tests/testdata/options-timeout.conf	CONF-SH	2016,2018
 ./lib/irs/tests/testdata/options-unknown.conf	CONF-SH	2016,2018
@@ -4704,6 +4696,7 @@
 ./util/checklibs.sh				SH	2017,2018
 ./util/commit-arm.sh				SH	2012,2016,2018
 ./util/copyrights				X	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./util/git-replay-merge.sh			SH	2018
 ./util/kit.sh					SH	2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2014,2015,2016,2017,2018
 ./util/mandoc2docbook.pl			PERL	2001,2004,2007,2012,2016,2018
 ./util/mdnbuildtest.sh				SH	2000,2001,2004,2007,2012,2016,2018