merge in lmp-mr1-release history after reset to 350074487acb6e5b75cf3149ebe815e060e60394