On admin pages, the default site ID to return should be preferably a website on which user has admin privilege
Make ecommerce log displayed
Merge remote-tracking branch 'origin/master'