0 40 02 official

- import g_src from 34.11
- import g_src from 40.02