merge in lmp-mr1-release history after reset to 3a2b9f0a49078223434927835d79d1ca9a751f16