March test1

Mnauel:

please review and merge ASAP. I need to build and test again over the weekend.
Thanks,
Yuyi