merge in lmp-mr1-release history after reset to 2f5251072284508374cb36d1e83f7e24cc590049