resync with latest vsc-base
added originating commit id