allow null domain and external code
Merge remote-tracking branch 'origin/master'