Take changes from master and put them into 2.0.x branch #46

Closed sbglasius closed 3 years ago