Update dictionary
Merge branch 'master' into 7_00
Update dictionary