Disruption refactoring

**DO NOT MERGE**

pr to open the discussion on disruption handling 
If you want to comment big chunk of code, with possibly comments inside, a clean way is
```c++
#if 0
blabla;
#endif
```