@penibelst What if I add this for layouts? Re: #2070