Merged latest pmt and mblock into trunk (eb/wip -r4262:4268)