merge in lmp-release history after reset to 3d123cc357954027400b383f60801b7ef1cdb6ca