Changes suggested by development and SVV teams.