merge in lmp-mr1-release history after reset to 1cf9ad1abb599ce4057189e0db154cf00b4913f8