Starting to merge the multiple devices branch with the one that allows multiple protocols