merge into dev release #669

Closed raphaelscholle closed 4 months ago