Following directx runtime (21/22)

Following directx runtime