006.02 folded in latest motate changes