Merge remote-tracking branch 'origin/Defect' into Defect

Conflicts:
	dont need this.txt