Mantis #4353 : Rework when using BDHandler.