Merge2head

This branch contains the mic development that is ready to be merged with the main code.
The main development branch is called mic.