Switch return_dict to True by default.
#8530
Merged
return_dict to True by default.
#8530