Merging of development branch into master for NMLv2beta1