First Merge with JB kernel updates