Merge "VID S1 Instantiation failing when include supplementary file"