merge in lmp-mr1-release history after reset to 9c20c155f82cbe8a83942b0f58694c135cb12cff