Merge branch 'topic/favorites-dnd'