[3.8] Fix #788 Add a default basket