merge in lmp-mr1-release history after reset to 169822fa272b6ddaf8919c6c5453a07bfd2e53d9