rebase beangle 3.3.6