NX-15391: align 5.8 branch on master:858dacb1955cdde0461db07d24a2a36d31fb7828, removing Aggregate stuff
NXP-15391 align on HF23 SNAP