merge in lmp-mr1-release history after reset to 254e31983572bc2cf08d80b30aa991757b695fff