Merge "Add flag for communication device refactor." into main