fix null error
Merge branch 'dev' into dev_mirror