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