comply with beta7 lang changes
Merge branch 'beta7'