Merge mstombs V35 changes with h0tw1r3 83d65deab691279e0b144116840b55d413c64ffa