merge in lmp-mr1-release history after reset to 28cfbf09145941b4f9a047523e24093167ce4491