Merge remote-tracking branch 'origin/core120' into kernel-4.14