merge in lmp-release history after reset to a508714800242b294291060641ed35d719bdc857