merge in lmp-mr1-release history after reset to 69775551807a160478d0d9c24e7cabd07db1bdb9