merge in lmp-mr1-release history after reset to 1ea32dfb0e08335150562fa6fd89695dd04c7b6d