Merging modifications from kelvin_ branches into