Please review branch feature/vagrant_130