add default branch
Merge remote-tracking branch 'origin/1.2.1-wip'
v1.2.1