Manually create the master-base-dist branch
Merge branch 'v3.0'