NO_JIRA: Merging heidi's updates.