Merge pull request: More devices