Merge Eti application into Refactoring

There are some functional improvements made to the ETI branch which are needed in the refactoring. The ETI application specific code will be factored out of refactoring branch in the future.