Merge "Fix bug #35673706 - null verifier component..."