#459 Fixed overriding of BaseLayout / RootLayout sections