merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a448fd23a