Rebasing on EPRJ 3.4 kernel project