merge in lmp-mr1-release history after reset to d00a0a734ef64ba917e5a124a16c1e4c196dd187