Exception for equal domain-s and/or port-s
Merge remote branch 'fork/Issue-212'