Supporting changes. v1.5 gold.