Merge branch '1439-favorite-deletion' into 'develop'