Merge branch 'fix/double-rt-or-fav' into 'develop'