Merged upstream version 6.1

1 job for release/0.1.1