Merge "Fix broken DNS Test" into klp-dev