Merging in multiple-domain support with multi-enabled feature from master branch