Merge branch 'feature-favourites' into development