merge from customizations_hosted_with_account_server
merge from upstream/backport2013_04