Merge pull request #6952 from remitamine/hostingbulk