commit 20.05
Merge branch 'develop' into Beta-1.0