make unit tests happy
Merge branch 'swfDomain' into stable