Sync 1.6.6 bullets with v1.6 branch