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