Pull changes from master into beta #1880

Closed jmtatsch closed 8 months ago