BUGFIX: Simplify PartialPublish & Discard (for now) to NOT select dimensions and have custom events

BUGFIX: Simplify PartialPublish & Discard (for now) to NOT select dimensions and have custom events #5220