[core] Cleanup and optimization
Merge remote-tracking branch 'origin/master'