2017-08-13 - striker
19:48	<bd808>	Cherry-picked 370139 fro final testing	[striker]