Interesting idea,
Maybe you could let gateway unpack the COMBO message before handing it over to controller. This way no additional changes is needed on that side.
I would appreciate if you wanted to create a github pull request (on the development branch) with your verified changes.
