Created by: ema-om
Synchronize with upstream repository and merge fix/c2sb_vf4 branch into integration/linked
fix/c2sb_vf4
integration/linked