2018-01-04 - production
08:53	<marostegui>	Fixing inconsistencies on s7 - T163190	[production]