Merge changes from yanniks kernel