Merged wip into mr1 kernel branch