Merge "DX: Fix tests 115, 119, 125"
am: 50b3c25ccf

* commit '50b3c25ccfd2f11bd1fe4039a3539798630fb40c':
  DX: Fix tests 115, 119, 125