[TIDOC-649] Correct Picker inheritance