Update L:MT from blead up to commit 35e037e8469