make scope test
Merge branch '1.12'