merge in lmp-mr1-release history after reset to 0d283729f3cb0bdc3f5afd992e5f49e56d1e5728