I plan to combine this with the fix for bug 1723914 which would allow you to only run one verification for both.
I plan to combine this with the fix for bug 1723914 which would allow you to only run one verification for both.