Terminplan 2021, vedtatt sept 2020