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