merge in master-release history after reset to c87631bbc47542011df647c9a9b9c265f272bfe2
tree: f99d0cb6b249edf5e30ecbc5e4461bb8e2ee7b58
  1. kernel