Merge "DX: Fix tests 029, 033, 116, 117" am: 474556575e
am: a16d31787a

* commit 'a16d31787a6413d3c637ea29903a2ff53214d3f4':
  DX: Fix tests 029, 033, 116, 117