core change
conflict fix
:Merge branch 'core_change'