manually merged bugid-98996 after conflicts in MarketingToolboxModuleWAMService.class.php