NXP-15814: move classification addon to optionals
NXP-15815: move agenda addon to optionals