Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	gt.txt