Topic mbl 10267

@jbest84 Please review