(Arnaud) merge with SL: add commented  BYPASS_DEBUG_ROUTINES.
(Arnaud) merge with SL: add commented  BYPASS_DEBUG_ROUTINES.


childmodel/child,childmodel/child,childmodel/child,childmodel/child,childmodel/child,childmodel/child