Topic mbl 10032

@CHenrie Please review