sync develop/master for patch2 release #679

Closed jmeixensperger closed 2 weeks ago