merging nildomain branch