cb project update (sdl2 files)
vc project update (maintenance, cherry-pick from 1.12)
vc project update (sdl2 files)