Merge "Expose BIP and VSIM relavent definitions" into sc-dev