Issue #2256435 by ptsimard: New layout.