21/5 changes
26-05-a
Merge Tobias and Kostas changes
Updates to the kernal.
conflicts merged 2