Commit: Add JDI second layout display fix