Merge from trunk
Merge from trunk
Use of LOGGER, cleanup of import and formatted using new formatter