Merge "enabling kernel 4.14"