sync with latest vsc-base version to fix log order