merge in lmp-release history after reset to 67efa6523d593d3ebdb3e22eafb186e26d4bad74