Merge branch 'clear_targets_from_compositor' into favourites
Merge branch 'reclaim_original_style' into favourites