[v1.5] released

rebased following M3