DDBNEXT-726: Edit favorites
Merge branch 'DDBNEXT-726-hla-editfav2' into develop