master merged to dev after 1.0.1-M3 release