Merge last changes from zenconf