merge in lmp-release history after reset to acfc688f7b0d107fff73d594b1372a0da662aa4a