Rebase fix: Manually merge missing custom dials code