Merge branch 'bug_617_default_favlist_handling_fix'