Please review branch feature/deviceloader