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