Working on adding generic input support to XBox controller
Fixed Merge with Filters