Please add cycle gadget and cycle class gadget button option

Could you please add a button mapping option for "cycle gadget" and a separate one for "cycle class gadget" (exclude specialist gadgets). This is mainly for console players but I imagine it could be helpful on keyboard.

The reason I'm requesting this is because I find the change fire mode when zoomed / swap to underbarrel keeps bugging out - changing fire modes works less than half the time and instead it usually swaps to the underbarrel, whilst when I want to swap to the underbarrel it usually changes fire mode without it being zoomed.

With a cycle class gadget option I could have the following button layout:

change firemode as up on the d-pad,

change to underbarrel as down on the d-pad,

specialist gadgets as left on the d-pad

and class gadgets as right on the d-pad.

This eliminates most of the buttons stuffing up - as in not doing what is intended.

I am using this set up right now, except with right on the d-pad as cycle inventory which is a lot more cumbersome.

The only issue I seem to have is when I change scopes in the attachment menu it also changes fire mode but its still a lot better than the stuffing up between fire mode / underbarrel that I normally experience.