core: update stuff

Chris Qiangrequested to merge
update into master

Merge request reports