Merge "Add custom extra width to trigger LPNH" into main