am 727b0dd2: Merge "Fix broken DNS Test" into klp-dev

* commit '727b0dd201e3216ad9d05788b1d08d4fc3eba27d':
  Fix broken DNS Test