Feature/sync

Merge distributed DNS features with the development branch