Merge remote-tracking branch 'origin/master'

Conflicts:
	test/table/1774/safety/sp_rate_placement.json