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

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