Not my understanding of BS7671 for a CU change Chapter 74 brown book - haven't got the red book yet, as I'm working to 16th until June.
There is no problem working to 17th before they become extant but the installation must comply with one or the other not some of one some of the other...