Fix best_base to select proper base class
#5324
Merged
best_base to select proper base class
#5324