merged Mochaleaf-rc3Fix