Merge branch 'log_domains' into maint-0.2.2