Merge pull request #3709 from naglis/hostingbulk