Merge remote-tracking branch 'refs/remotes/origin/feat/entity-centric-metrics' into feat/entity-centric-metrics