both master site and WWW Submitted by: Thomas Habets <thomas@habets.pp.se>
PR: 21670, 21778 Submitted by: Roman Shterenzon <roman@xpert.com>