Merge branch 'feat/entity-centric-metrics' into 'epic/pro-affiliate-launch'