refactored and organized it.
Merge remote-tracking branch 'origin/Release6' into Release6