Focus and justify integration
Merge pull request #6 from drc-devs/bug/focus_justify_integration

Focus and justify integration