Topic mbl 10550

@CHenrie Please review