Specifies basic safety and public health related requirements for water heaters and hot-water storage tanks that are intended for connection to a potable water supply, such as water heaters designed for connection to cold water supply mains, including storage water heaters, heat-exchange water heaters, hot-water storage tanks with an external energy source, instantaneous water heaters and boiling-water dispensers.