Change some functions to overload.
Merge branch 'master' into Change_to_overloaded_function

Conflicts:
	TestSMBValidator.pas