updates
Merge remote-tracking branch 'origin/7.1.4' into 7.1.4

Conflicts:
	HRI/Controllers/HriApiController.cs