merge in lmp-mr1-release history after reset to d92a6c16d775a40c0bf7bdf5a5f275be1e580b5c