Reordered convert_basic and convert_reference to move disambig conversion up.
Fixed #2753.
Merge remote-tracking branch 'origin' into 2755-fix-tests