Fix build issue after merge - unclear if DNS part was corectly merged, need to review it