Merge branch 'Catalina' into Beta-1.0