Merge branch 'feature/favorites' into feature/extendedtargets
* Cleanup of extended targets handling
Merge branch 'feature/extendedtargets' into feature/favorites