merge in lmp-release history after reset to f34c3501948190acf44defefba8eb161ec6dc07b