Final static-pages changes