Please review branch feature/xenserver-impact