major cleaning and debugging enhancements to non-Impact parts of client
Merging in major cleaning and debugging enhancements of non-Impact parts of client