5.4.2 with next-funnel and tooltip formatter improvement

5.4.2 with:

• apache#17897
• apache#16942

5.4.2 with next-funnel branch

5.4.2-next-funnel

Merge remote-tracking branch 'origin/next-funnel' into 5.4.2-next-funnel