Fixed mdo handling
auto-merge staging into master