Fix the since and before filter behavior Upstream-commit: 61efb4d08487623474d6c21d68b0b34a2117da67 Component: engine