fix
Merge branch 'bf-1.7' into release-v1.7