Merge pull request #3673 from zorun/bmon_4.0