sync with latest vsc-base version
Merge pull request #1039 from boegel/fix_log_order

sync with latest vsc-base version to fix log order