[core] missed parts for 897f047 commit