Right now we have found a hacky way to do it with #669, but we need to improve as it messes up RCDevice code