merge in lmp-release history after reset to 6156bcad42b8a08dcf41b7cb12be90d2c6d02cf5