merge in master-release history after reset to master
tree: 9f150458298a2726c0b54788620ad42f9a7c9444
  1. kernel