Commits from jf kernel:

- 9f39969f64f835d4fbbb73c0961a7b872e8fa948
- b508aa0b871079db467e330fea5883a8380ae20d
- 08b5664521de1072c3ec809c821c2319b1c485b6