merge in lmp-mr1-release history after reset to 23c6aa9a54d0a220fb2557197c555b2684c93876