merge in lmp-release history after reset to cce67e1f283eb417bea1bd9d65e0e5b035b1405f