[TIDOC-649] Correct Picker inheritance
Merge pull request #5447 from bhatfield/tidoc-649

[TIDOC-649] Correct Picker inheritance